Fix double free of font desc.

Tue Aug 22 12:33:24 2000  Owen Taylor  <otaylor@redhat.com>

	* gtk/testgtk.c (create_styles): Fix double free of
	font desc.

diff --git a/ChangeLog b/ChangeLog
index c4d6fe9c5ba51951da4121b34c13d4fdd7560649..c99a2fd65bce5df08b8dddddda8264d9d031a6d4 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+Tue Aug 22 12:33:24 2000  Owen Taylor  <otaylor@redhat.com>
+
+       * gtk/testgtk.c (create_styles): Fix double free of
+       font desc.
+
 Mon Aug 21 22:39:18 2000  Owen Taylor  <otaylor@redhat.com>
 
         * gtk/gtkwidget.[ch]: Add gtk_widget_modify_{fg,bg,text,base,font}.

diff --git a/ChangeLog.pre-2-0 b/ChangeLog.pre-2-0
index c4d6fe9c5ba51951da4121b34c13d4fdd7560649..c99a2fd65bce5df08b8dddddda8264d9d031a6d4 100644 (file)
--- a/ChangeLog.pre-2-0
+++ b/ChangeLog.pre-2-0
@@ -1,3 +1,8 @@
+Tue Aug 22 12:33:24 2000  Owen Taylor  <otaylor@redhat.com>
+
+       * gtk/testgtk.c (create_styles): Fix double free of
+       font desc.
+
 Mon Aug 21 22:39:18 2000  Owen Taylor  <otaylor@redhat.com>
 
         * gtk/gtkwidget.[ch]: Add gtk_widget_modify_{fg,bg,text,base,font}.

diff --git a/ChangeLog.pre-2-10 b/ChangeLog.pre-2-10
index c4d6fe9c5ba51951da4121b34c13d4fdd7560649..c99a2fd65bce5df08b8dddddda8264d9d031a6d4 100644 (file)
--- a/ChangeLog.pre-2-10
+++ b/ChangeLog.pre-2-10
@@ -1,3 +1,8 @@
+Tue Aug 22 12:33:24 2000  Owen Taylor  <otaylor@redhat.com>
+
+       * gtk/testgtk.c (create_styles): Fix double free of
+       font desc.
+
 Mon Aug 21 22:39:18 2000  Owen Taylor  <otaylor@redhat.com>
 
         * gtk/gtkwidget.[ch]: Add gtk_widget_modify_{fg,bg,text,base,font}.

diff --git a/ChangeLog.pre-2-2 b/ChangeLog.pre-2-2
index c4d6fe9c5ba51951da4121b34c13d4fdd7560649..c99a2fd65bce5df08b8dddddda8264d9d031a6d4 100644 (file)
--- a/ChangeLog.pre-2-2
+++ b/ChangeLog.pre-2-2
@@ -1,3 +1,8 @@
+Tue Aug 22 12:33:24 2000  Owen Taylor  <otaylor@redhat.com>
+
+       * gtk/testgtk.c (create_styles): Fix double free of
+       font desc.
+
 Mon Aug 21 22:39:18 2000  Owen Taylor  <otaylor@redhat.com>
 
         * gtk/gtkwidget.[ch]: Add gtk_widget_modify_{fg,bg,text,base,font}.

diff --git a/ChangeLog.pre-2-4 b/ChangeLog.pre-2-4
index c4d6fe9c5ba51951da4121b34c13d4fdd7560649..c99a2fd65bce5df08b8dddddda8264d9d031a6d4 100644 (file)
--- a/ChangeLog.pre-2-4
+++ b/ChangeLog.pre-2-4
@@ -1,3 +1,8 @@
+Tue Aug 22 12:33:24 2000  Owen Taylor  <otaylor@redhat.com>
+
+       * gtk/testgtk.c (create_styles): Fix double free of
+       font desc.
+
 Mon Aug 21 22:39:18 2000  Owen Taylor  <otaylor@redhat.com>
 
         * gtk/gtkwidget.[ch]: Add gtk_widget_modify_{fg,bg,text,base,font}.

diff --git a/ChangeLog.pre-2-6 b/ChangeLog.pre-2-6
index c4d6fe9c5ba51951da4121b34c13d4fdd7560649..c99a2fd65bce5df08b8dddddda8264d9d031a6d4 100644 (file)
--- a/ChangeLog.pre-2-6
+++ b/ChangeLog.pre-2-6
@@ -1,3 +1,8 @@
+Tue Aug 22 12:33:24 2000  Owen Taylor  <otaylor@redhat.com>
+
+       * gtk/testgtk.c (create_styles): Fix double free of
+       font desc.
+
 Mon Aug 21 22:39:18 2000  Owen Taylor  <otaylor@redhat.com>
 
         * gtk/gtkwidget.[ch]: Add gtk_widget_modify_{fg,bg,text,base,font}.

diff --git a/ChangeLog.pre-2-8 b/ChangeLog.pre-2-8
index c4d6fe9c5ba51951da4121b34c13d4fdd7560649..c99a2fd65bce5df08b8dddddda8264d9d031a6d4 100644 (file)
--- a/ChangeLog.pre-2-8
+++ b/ChangeLog.pre-2-8
@@ -1,3 +1,8 @@
+Tue Aug 22 12:33:24 2000  Owen Taylor  <otaylor@redhat.com>
+
+       * gtk/testgtk.c (create_styles): Fix double free of
+       font desc.
+
 Mon Aug 21 22:39:18 2000  Owen Taylor  <otaylor@redhat.com>
 
         * gtk/gtkwidget.[ch]: Add gtk_widget_modify_{fg,bg,text,base,font}.

diff --git a/gtk/testgtk.c b/gtk/testgtk.c
index 0f01ddf7149567b356c89477fc3ca9e42e27800f..eb58685e240c2d2de3da105905b347a1df72c07b 100644 (file)
--- a/gtk/testgtk.c
+++ b/gtk/testgtk.c
@@ -8581,8 +8581,6 @@ create_styles (void)
       g_object_unref (G_OBJECT (rc_style));
       
       gtk_box_pack_start (GTK_BOX (vbox), button, FALSE, FALSE, 0);
-
-      pango_font_description_free (font_desc);
     }
   
   if (!GTK_WIDGET_VISIBLE (window))

diff --git a/tests/testgtk.c b/tests/testgtk.c
index 0f01ddf7149567b356c89477fc3ca9e42e27800f..eb58685e240c2d2de3da105905b347a1df72c07b 100644 (file)
--- a/tests/testgtk.c
+++ b/tests/testgtk.c
@@ -8581,8 +8581,6 @@ create_styles (void)
       g_object_unref (G_OBJECT (rc_style));
       
       gtk_box_pack_start (GTK_BOX (vbox), button, FALSE, FALSE, 0);
-
-      pango_font_description_free (font_desc);
     }
   
   if (!GTK_WIDGET_VISIBLE (window))